From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 16 Aug 2004 22:53:28 +0000 (+0000)
Subject: (merge_face_ref): Specifying `unspecified' is a no-op.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~21382
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=c743a7be70b9b718648d584c79df1cc693fe05df;p=emacs.git

(merge_face_ref): Specifying `unspecified' is a no-op.
---

diff --git a/src/xfaces.c b/src/xfaces.c
index f78ecacee1a..aafd762b73b 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -3626,7 +3626,10 @@ merge_face_ref (f, face_ref, to, err_msgs, named_merge_points)
 	      Lisp_Object value = XCAR (XCDR (face_ref));
 	      int err = 0;
 
-	      if (EQ (keyword, QCfamily))
+	      /* Specifying `unspecified' is a no-op.  */
+	      if (EQ (value, Qunspecified))
+		;
+	      else if (EQ (keyword, QCfamily))
 		{
 		  if (STRINGP (value))
 		    to[LFACE_FAMILY_INDEX] = value;